Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rds/option_group: Fix bad diffs with version and port #33511

Merged
merged 7 commits into from
Sep 18, 2023
Merged

rds/option_group: Fix bad diffs with version and port #33511

merged 7 commits into from
Sep 18, 2023

Conversation

YakDriver
Copy link
Member

@YakDriver YakDriver commented Sep 18, 2023 •
edited
Loading

Description

Previously, on reading options back from AWS, version and port would be set even if they weren't configured. This PR changes that to check first if version and/or port is set in the configuration before setting the value from AWS.

This approach can be misleading in this scenario: a) version is set and applied, b) version is removed from the configuration. Diffs in version will not be checked. (The same would be true of port.) A practitioner may assume that removing the value will clear or remove the value from the AWS infrastructure. However, removing the value from configuration will instead just mean that Terraform will not detect diffs for version in the future.

Relations

Closes #21367

References

Output from Acceptance Testing

% make t T=TestAccRDSOptionGroup_ K=rds P=4
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/rds/... -v -count 1 -parallel 4 -run='TestAccRDSOptionGroup_'  -timeout 180m
=== RUN   TestAccRDSOptionGroup_basic
=== PAUSE TestAccRDSOptionGroup_basic
=== RUN   TestAccRDSOptionGroup_timeoutBlock
=== PAUSE TestAccRDSOptionGroup_timeoutBlock
=== RUN   TestAccRDSOptionGroup_namePrefix
=== PAUSE TestAccRDSOptionGroup_namePrefix
=== RUN   TestAccRDSOptionGroup_generatedName
=== PAUSE TestAccRDSOptionGroup_generatedName
=== RUN   TestAccRDSOptionGroup_optionGroupDescription
=== PAUSE TestAccRDSOptionGroup_optionGroupDescription
=== RUN   TestAccRDSOptionGroup_basicDestroyWithInstance
=== PAUSE TestAccRDSOptionGroup_basicDestroyWithInstance
=== RUN   TestAccRDSOptionGroup_Option_optionSettings
=== PAUSE TestAccRDSOptionGroup_Option_optionSettings
=== RUN   TestAccRDSOptionGroup_OptionOptionSettings_iamRole
=== PAUSE TestAccRDSOptionGroup_OptionOptionSettings_iamRole
=== RUN   TestAccRDSOptionGroup_sqlServerOptionsUpdate
=== PAUSE TestAccRDSOptionGroup_sqlServerOptionsUpdate
=== RUN   TestAccRDSOptionGroup_oracleOptionsUpdate
=== PAUSE TestAccRDSOptionGroup_oracleOptionsUpdate
=== RUN   TestAccRDSOptionGroup_OptionOptionSettings_multipleNonDefault
=== PAUSE TestAccRDSOptionGroup_OptionOptionSettings_multipleNonDefault
=== RUN   TestAccRDSOptionGroup_multipleOptions
=== PAUSE TestAccRDSOptionGroup_multipleOptions
=== RUN   TestAccRDSOptionGroup_tags
=== PAUSE TestAccRDSOptionGroup_tags
=== RUN   TestAccRDSOptionGroup_Tags_withOptions
=== PAUSE TestAccRDSOptionGroup_Tags_withOptions
=== RUN   TestAccRDSOptionGroup_badDiffs
=== PAUSE TestAccRDSOptionGroup_badDiffs
=== CONT  TestAccRDSOptionGroup_basic
=== CONT  TestAccRDSOptionGroup_sqlServerOptionsUpdate
=== CONT  TestAccRDSOptionGroup_tags
=== CONT  TestAccRDSOptionGroup_badDiffs
--- PASS: TestAccRDSOptionGroup_basic (31.33s)
=== CONT  TestAccRDSOptionGroup_OptionOptionSettings_multipleNonDefault
--- PASS: TestAccRDSOptionGroup_sqlServerOptionsUpdate (53.36s)
=== CONT  TestAccRDSOptionGroup_multipleOptions
--- PASS: TestAccRDSOptionGroup_badDiffs (64.79s)
=== CONT  TestAccRDSOptionGroup_Tags_withOptions
--- PASS: TestAccRDSOptionGroup_tags (72.11s)
=== CONT  TestAccRDSOptionGroup_optionGroupDescription
--- PASS: TestAccRDSOptionGroup_OptionOptionSettings_multipleNonDefault (50.33s)
=== CONT  TestAccRDSOptionGroup_OptionOptionSettings_iamRole
--- PASS: TestAccRDSOptionGroup_multipleOptions (29.61s)
=== CONT  TestAccRDSOptionGroup_Option_optionSettings
--- PASS: TestAccRDSOptionGroup_optionGroupDescription (29.39s)
=== CONT  TestAccRDSOptionGroup_basicDestroyWithInstance
--- PASS: TestAccRDSOptionGroup_OptionOptionSettings_iamRole (39.78s)
=== CONT  TestAccRDSOptionGroup_oracleOptionsUpdate
--- PASS: TestAccRDSOptionGroup_Tags_withOptions (70.10s)
=== CONT  TestAccRDSOptionGroup_namePrefix
--- PASS: TestAccRDSOptionGroup_Option_optionSettings (53.10s)
=== CONT  TestAccRDSOptionGroup_generatedName
--- PASS: TestAccRDSOptionGroup_namePrefix (28.31s)
=== CONT  TestAccRDSOptionGroup_timeoutBlock
--- PASS: TestAccRDSOptionGroup_generatedName (27.88s)
--- PASS: TestAccRDSOptionGroup_oracleOptionsUpdate (52.41s)
--- PASS: TestAccRDSOptionGroup_timeoutBlock (26.21s)
--- PASS: TestAccRDSOptionGroup_basicDestroyWithInstance (637.95s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/rds	741.179s

@github-actions
Copy link

Community Note

Voting for Prioritization

  • Please vote on this pull request by adding a 👍 reaction to the original post to help the community and maintainers prioritize this pull request.
  • Please see our prioritization guide for information on how we prioritize.
  • Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for issue followers and do not help prioritize the request.

For Submitters

  • Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
  • For new resources and data sources, use skaff to generate scaffolding with comments detailing common expectations.
  • Whether or not the branch has been rebased will not impact prioritization, but doing so is always a welcome surprise.

@github-actions github-actions bot added size/L Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/rds Issues and PRs that pertain to the rds service. labels Sep 18, 2023
@terraform-aws-provider terraform-aws-provider bot added the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Sep 18, 2023
@YakDriver YakDriver added this to the v5.18.0 milestone Sep 18, 2023
@YakDriver YakDriver merged commit 4f743e3 into main Sep 18, 2023
43 checks passed
@YakDriver YakDriver deleted the b-rds-sqlt-oracleee branch September 18, 2023 20:42
github-actions bot pushed a commit that referenced this pull request Sep 18, 2023
Update CHANGELOG.md for #33511
1c8f7f4
@github-actions
Copy link

This functionality has been released in v5.18.0 of the Terraform AWS Provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template. Thank you!

@github-actions
Copy link

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 23, 2023
@justinretzolk justinretzolk added the bug Addresses a defect in current functionality. label Feb 10, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
bug Addresses a defect in current functionality. prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. service/rds Issues and PRs that pertain to the rds service. size/L Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Milestone
v5.18.0
Development

Successfully merging this pull request may close these issues.

TF plans show changes to db option groups when there are no changes
2 participants
@YakDriver @justinretzolk